projects
/
project
/
opkg-lede.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fa137c2
)
Revert "libopkg: accept alternative notation for "Replaces" control field"
author
Jo-Philipp Wich
<
[email protected]
>
Fri, 18 Jan 2019 17:41:16 +0000
(18:41 +0100)
committer
Jo-Philipp Wich
<
[email protected]
>
Fri, 18 Jan 2019 17:42:09 +0000
(18:42 +0100)
This reverts commit
1504d35f123980bf322df99fb434f6fda6e3ecd2
.
We won't use Replaces: for the repo ABI_VERSION tracking after all, so
drop this hack before it becomes another liability.
Signed-off-by: Jo-Philipp Wich <
[email protected]
>
libopkg/pkg_parse.c
patch
|
blob
|
history
diff --git
a/libopkg/pkg_parse.c
b/libopkg/pkg_parse.c
index f6199da70c7fa0226805c4f0b6d4ce501fb2e05a..0baa4db396569be816386b50568c57e12d1cd98c 100644
(file)
--- a/
libopkg/pkg_parse.c
+++ b/
libopkg/pkg_parse.c
@@
-302,7
+302,7
@@
int pkg_parse_line(void *ptr, char *line, uint mask)
case 'R':
if ((mask & PFM_RECOMMENDS) && is_field("Recommends", line))
parse_deplist(pkg, RECOMMEND, line + strlen("Recommends") + 1);
- else if ((mask & PFM_REPLACES) &&
(is_field("Replaces", line) || is_field("Replace2", line)
))
+ else if ((mask & PFM_REPLACES) &&
is_field("Replaces", line
))
parse_replacelist(pkg, line + strlen("Replaces") + 1);
break;